overridden the default method to fix the bug