Version 0.0.9 fix