Temporary fix to spawn protection issue (See Issue #4)