Fixed code from last merge conflict.