[ issue1241 ] Fixed issue #1241, still room for refactoring