Temporary fix for #254