Sort of fixed #26.