Opening ticket as reference to #398 which was just merged in
Opening ticket as reference to #398 which was just merged in