Followup to #11

Should fix #12