#57 - fix from/to