Maintainer logic improve

#363 #362