Same problem #30 had - do this properly.