Fixed to tolerant compiler

DEV-825