Version 1.0 fix