Fixed previous work