Some fix @AlexSelzer required...