Fix - passes base test now