this fixes #344 (really)