Fix for tag 1.0