Fix for ponder issues 5 and 6