Maybe fixing 576

This could fix #576