Following from https://github.com/rxdi/firelink/issues/46
Following from #46