Removed @SupressWarning and optimized bugfix