Fixed #95: using fork with fix