fixes per @karmi's request