Another fix to allow it to work with BB 0.9.2