cleaned up a bit and added comment on known issue