Fixed a bug with 1.28