Restore @tahmmee's fix from (#6)