Small bug-fix to