[BUG] Wrong type in domain objects - #13