Fixed all stuff