Fix #16 (to some degree)