fix for home and end