[PS 1.6] Display pictures only connected to attribute

[Jurist]

Hi,

I have a problem with default gallery of PS 1.6. 

In our store there are products connected to each attribute, let's say:

Attribute 1 - pic1, pic3, pic5;

Attribute 2 - pic2, pic4, pic6.

Setting pictures to attributes works only partially - in the gallery thumbnails only pictures connected to attribute, which is fine.

However if you set attribute 2 for example and click on first picture, you can go next through the buttons in gallery and see pictures connected to attribute 1.

Is there any way to change that? I would like only attributes 2 to be displayed in gallery at any time.

Thanks