Possible fix for null error
Remove @s :(