Temporary fix for #34