Bug fix on start