Added handeling for a few special cases