Fixes #1 (Stability)