this should fix [#453]