A quick workaround to #22