Some bug-fix