Reverted last fix: caused crash on server