More bug-fix