Refactoring...
Bug-fix!