Fix for PM-691