Fixed possible issues with 0.8