some fixed for 2b