Revert "Fixed issue on startup"

This reverts commit 942d2e94f11bc612613c82741487fb513e82521d.