This should fix #409, but it might also cause errors. Please test!