Added some special cases manually