docblocks and possible bugfix