fixing alignment issues fixes #611