Fix for PICO-387