Fixed functions
fix