Amount check bugfix