aaaaand another bug fixed #45