Fix lp:1399229



(Review request: http://reviews.vapour.ws/r/586/)