Reverted last bugfix for now (caused other bug)