Fill Er Up - Custom Assessment - fix for #129