Palliative solution to (#14)