Adjusts MAXAMT calculation and resolves #142