Fixed issues with peteb variables