fixed #1 again