Fixed edge case in construcot