typo fix and added toxic support