Fixed #1268 take 2