fix for #wagon (issue no 9)