add test and last minute fix