fixed #5 again