Bug fix hopefully