Dirty fix for argument inconsistency