Fixed integer problem with id.
Merge branch 'integer_fix' into develop