Try fixing #190.