Version 0.7.1 fix