Bug fix
Merged changes from raring