Corrected bug induced in #db5bafb36f