Fixed so it can cope with * as a parameter