catch 1.5 based on mipstian's work