Simplify
Fix breaking bug induced in 3961ce8