Fix for task #152.