Workaround for rickshaw bug