Refactoring bugs fixed