reimplement #461 in hotfixes