this should fix some problems (#3)