will be changed when #1280 get's in, otherwise fixed