hack that fixes #5