Fix for 1.0

Fix for 1.0