Second part of fix