Fixed bug introduced in prev. commits.