fixed #27; it is a better fix