Fixed issues - version 4