Catch 1.5 (forked from original code by mipstian)