Reverted to version 0.09