Bugifx: fixed previous fix