Fix for CE 1.9