Feature/fix issue 604

/to @ritch 
/cc @cgole 

See https://github.com/strongloop/strong-arc/issues/604
nice to have: remove this