Suggestion for improvment

Perhaps this thread helps, @devia