[TIMODOPEN-416] Fix for BB