Changed define a bit. One bug fixed