this should fix issue#57