Adding to fix this bug: