#88 quick and dirty fix
#88 fix test