fixed bug in core class
bugfix on core class