Updated for version 0.7.6hf1