Fixed #21 already, also fix #26 furreal