first part of fix
second part of fix