re #138 : Synced with changed in framework