Fix #16 (this modification should be safe...)