Fix for GH OC #505