Fix rhino merge error. Fixes #1184