works correctly again