Fixed issues by sp3ctum