Fixes #74 Eclipse crash