reverted last bugfix, it actually broke it more