Fixes recusion problem