aaaaaaand another bug fixed