Fixing logic to cover all cases
Fixing logic to cover all cases

saimn/astropy,mhvk/astropy,larrybradley/astropy,StuartLittlefair/astropy,dhomeier/astropy,StuartLittlefair/astropy,aleksandr-bakanov/astropy,lpsinger/astropy,saimn/astropy,stargaser/astropy,astropy/astropy,astropy/astropy,bsipocz/astropy,stargaser/astropy,lpsinger/astropy,dhomeier/astropy,astropy/astropy,dhomeier/astropy,saimn/astropy,aleksandr-bakanov/astropy,astropy/astropy,MSeifert04/astropy,saimn/astropy,saimn/astropy,lpsinger/astropy,pllim/astropy,lpsinger/astropy,larrybradley/astropy,pllim/astropy,stargaser/astropy,pllim/astropy,MSeifert04/astropy,pllim/astropy,larrybradley/astropy,astropy/astropy,larrybradley/astropy,dhomeier/astropy,MSeifert04/astropy,mhvk/astropy,stargaser/astropy,lpsinger/astropy,StuartLittlefair/astropy,mhvk/astropy,StuartLittlefair/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,bsipocz/astropy,mhvk/astropy,dhomeier/astropy,larrybradley/astropy,aleksandr-bakanov/astropy,StuartLittlefair/astropy,mhvk/astropy,bsipocz/astropy,pllim/astropy,MSeifert04/astropy