bug fixed without changing core files