Made homesick-compatible