Fix #14 - the probem is really at #33