fixed #211 again