Fix for lp:1241515