Fixing parameters to work correctly