https://github.com/joelfire/subway/issues/5 fix