Fix issues with previous commit [MJ-480]