Fix #16 - bug on routes