Fixed issue: Rollback 256f478