Fixed issues with short code