Temporary fix for #3