Fixed #5 again