fix for #wagon (issue no 12)