Fix #9 Again