fixes for portriat issue