finally fixed #5 (?)