Fixed #2 again