Fix for OBANYC-1879