fix http://ezbacklog.appspot.com/f/items/9003/21011