Special Cases fixed