BUGFIX: -= was overwriting input map