Fixes trailing ?