Fixes #41, more stability