Bug fix for rc1