Bugfix to previous