Fixed SWAMP-49