Temporary fix for #9