Fixed problem with multiple issues