Attempted fix at #190