Fix properly