BUG: Fixing small bug (inversion between x and y)
COMP: fix compilation for clang 3.5