Removed cycles in the application

Fixed #95