Use change suffix. Solve part of #110