bugfix and ease of dev